Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 2 Jun 2010 00:16:28 +0000 (00:16 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 2 Jun 2010 00:16:28 +0000 (00:16 +0000)

Trivial merge